am 51e1c476: am 0b53db4c: am 2ca17ba2: am 56f4ffde: am fd3509ef: Merge "Consolidate 7inch and 10inch layout"
* commit '51e1c476a3dbd1f9cb9396979bbf08f3d49c108b':main
commit
3b6d0562c1
* commit '51e1c476a3dbd1f9cb9396979bbf08f3d49c108b':main