Merge "Fix widecg and hdr ordering in Configuration"