Merge "Fix resolution change within a decode call." into mnc-dev