Merge "DO NOT MERGE Fixed bug in the case of resolution change." into nyc-dev
am: 3d01dc4bdd

Change-Id: Ia7bcdb836e2cde9925812ddef6736b89cd0e2f8f