Merge "MediaPlayer: properly handle released surfaces" into ics-mr0