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

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