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

Change-Id: I3939df24a6057111ef5f350e5ec1c1214e96b6b4