Merge "Use MediaPlayer in a background thread." into tm-dev