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