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

Change-Id: I31e4414d25e94b79d413f4346ee81d44183bf44d