am e54dbc4a: am 3ba16c1d: LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

* commit 'e54dbc4ac74d110c4121932a22d04447a0e15b65':
  LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]