Merge "Controls UI - Update unlocked icon" into rvc-dev