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

Change-Id: I6bfa3d6fdb326505d3359b8c601d0717fa2adf45