Merge \\"Fix layout issue after insets changed\\" into nyc-dev am: 119f1715b3
am: 242a44395e

Change-Id: Iab3e11ed6346ed538f3206faa32d15e6e227efef