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