Merge "SF: Set state modified flag when changing sizes" into nyc-dev am: 0abac03fc9
am: 3666cc2bae

* commit '3666cc2bae3f73e90c9eb6d8a6d4ce623ee9f745':
  SF: Set state modified flag when changing sizes

Change-Id: I4195da89a5a6ff06c365a8a30e8456664c185f57