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

Change-Id: I064c05ce3f4347ddfc41dceebccb2d8bdc5a845e