Merge "Fix 5044158: Initial pass: add music transport controls to LockScreen"