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

Change-Id: I623e85078871d2540fcabebfa7343ec3945cabcc