Merge \\"Do a forceLayout if pending insets is changed after relayout window\\" into nyc-dev am: 2756d0707f
am: dba235d91a

Change-Id: I1a9758b62322aecaea79c879f82b1793bae67061