Merge "Update controls after addToDisplay/relayout before dispatching insets" into rvc-dev am: 77d7bcc124 am: 2873becff7

Change-Id: I8bbbfc525a16b8b62865618fb2cc707c953c47c2