Merge "Retain media controls longer" into tm-qpr-dev