Merge "Fixed an issue where media could flicker during bypass" into sc-dev