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

Change-Id: Ic1bd7462ec57ff752dd0fb6fc8bd7bad4173fa09