Merge "Avoid blocking media loads when converting from resume to active" into main