Merge "Do a forceLayout if pending insets is changed after relayout window" into nyc-dev