Merge "Recreate media controls when style changes" into rvc-qpr-dev