Merge "Fix layout issue after insets changed" into nyc-dev