Merge "Controls UI - Lock screen support" into rvc-dev am: 303e4056ac am: b9a4e39144 am: 74822a35c3
Change-Id: I0416990abc78ced98cf0844fa4339f78b58ba64b
This commit is contained in: