Merge "Reduce chance for leak in MediaPlayerData" into sc-dev