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