am f2cf3c19: (-s ours) am dd7d7aac: am de8da279: (-s ours) am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'f2cf3c19e356ad34a181933742c64c842e431513':