Merge "Update controls after addToDisplay/relayout before dispatching insets" into rvc-dev am: 77d7bcc124 am: 997e6ab588 am: c62b7fa6f5

Change-Id: Ia81f1891064d22dc951071d433bda7e70798ebc5