Merge "Remove media controls refactor flag" into main