Includes_MediaFlags.xml merge fix