Merge "Handle media load events while testing for resume" into sc-dev