Merge "Ensure the requested insets state is up to date" into rvc-dev am: b8ad491e6d

Change-Id: I2fef89c2e1e20c17c51c20ccd5434ecc3b610b39