Merge "Fix transition after restarting inactive media" into sc-dev