Merge "Reorder media players when orientation changes" into tm-qpr-dev