Merge "Revert "Remove media players if their backing session dissappears""