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 am: 85b8159c Change-Id: Iad7ea0ad904f26f9aa3695bd07c5ce30ab89cc93