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