Merge "Update controls after addToDisplay/relayout before dispatching insets" into rvc-dev