Merge "Merge "Controls UI - Handle activity dismissal from dialog" into rvc-dev am: 84bc21cb am: 3d21ab95" into rvc-d1-dev-plus-aosp