am 0b53db4c: am 2ca17ba2: am 56f4ffde: am fd3509ef: Merge "Consolidate 7inch and 10inch layout"
* commit '0b53db4c728d21bee3b7c50f87564bcf9694f5a2':main
commit
51e1c476a3
* commit '0b53db4c728d21bee3b7c50f87564bcf9694f5a2':main