Merge "Lock screen media controls" into rvc-dev