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