Merge "Keep those MediaControllers of none addressed players to be up-to-date"...
Merge "Keep those MediaControllers of none addressed players to be up-to-date" am: cbbd4fcc am: 140c84a4
am: d5c5a256
Change-Id: I20968b6939a56e464f6f8e3ad70797c61913bd79