Merge "Fix enterAlways|enterAlwaysCollapsed with window insets" into nyc-dev