Merge "Fix 5044158: Integrate music transport control into LockScreen"