am 1a2519f7: am d0c34cba: am 683e3cfe: Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev

* commit '1a2519f791d7493e5ca0c2c17a42b91569a7faf7':
  MediaController: Keep the controller when touch exploration is enabled