Merge "Controls UI - Lock screen support" into rvc-dev am: 303e4056ac am: 0d6dc417c0 am: 31bc8d0e05
Change-Id: I8ba13c81ddb47a11d0609d257668913df7ede5c8
This commit is contained in: