Merge "Controls UI - Lock screen support" into rvc-dev am: 303e4056ac am: 0d6dc417c0 am: 11bc1e0855 am: c0b9482b93
Change-Id: I4e2d75a0dc41cb59642cc4bbf748ba6096916379
This commit is contained in: