Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev