Merge "Controls UI - Handle activity dismissal from dialog" into rvc-dev