am dc7af883: am 71b74a73: am 3b6d0562: am 51e1c476: am 0b53db4c: am 2ca17ba2: am 56f4ffde: am fd3509ef: Merge "Consolidate 7inch and 10inch layout"
* commit 'dc7af8838d0c38d26934c238620e7638d64089b9':main
commit
0a42d7890a
* commit 'dc7af8838d0c38d26934c238620e7638d64089b9':main