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

Change-Id: Ifd572c66d391c6f0cb1c6223879497f91f9e9765