Merge "Recreate media controls when style changes"