Merge "Remove media players if their backing session dissappears" am: b8b822bccd
am: d7835086b8

Change-Id: I326ae191f879fc960ba4b97a80b47a47a98dd1e4