Merge "Organize media control classes" into tm-qpr-dev