Merge "Fix enterAlways|enterAlwaysCollapsed with window insets" into nyc-dev am: 3df4cf603e am: c321341d60
am: 78de34b4bf

* commit '78de34b4bf2f8d74b1a206334e704a236aaa8bf5':
  Fix enterAlways|enterAlwaysCollapsed with window insets

Change-Id: I80ce3d2db6ad44513cf5101ce5104f876016e75a