Merge "Controls UI - Update unlocked icon" into rvc-dev am: 40ed0d8f am: 3b24b59f am: 5e9db588 Change-Id: I08725a3f4da4b6f97c6fbe63ddd87234bfc1ee4d