Merge "Revert "Remove media players if their backing session dissappears"" am: bb81ed590d
am: f65f9bb86d

Change-Id: Ibc84b262692af22555e96e95368db4d27cdc96da