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