Merge "Fix media transitions when inactive" into sc-dev