am eaacc7c1: am bb78ae9e: am 8cba0d0b: Merge "Fix scrubbing behavior on keyguard music transport" into klp-dev

* commit 'eaacc7c1ba4ff00bac36f5fbfd7269b04eb77cae':
  Fix scrubbing behavior on keyguard music transport