Merge "Keep those MediaControllers of none addressed players to be up-to-date"
am: cbbd4fcc5b

Change-Id: I090d231d3f08bcfeb486836e4f8c38ef9bbb0881