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

Change-Id: I343dc8ad193ad83a8c0628c104836bd392cd07d5