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

Change-Id: I3de76ea399768aa9f9cc504bdcb25208e60c579d