Merge "Controls UI - Detail dialog fix" into rvc-dev