Merge "Reorder media player cards" into tm-qpr-dev