Updated with #7737086b59 from mediaelement flex_build branch