Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0