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: d5b8ac83 am: f68cb034
am: 2535b0a2
Change-Id: I20968b6939a56e464f6f8e3ad70797c61913bd79