Merge "Fix resolution change within a decode call." into mnc-dev am: 7fc42b80 am: 252ca18a am: 4c6288e8 am: 90fc697c am: 8b3d0432 am: d603f906 am: e1b496ba Change-Id: Iacc59535a895a58b83388ec538d625b256b195a6