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