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

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

Change-Id: I431d35ca4e9b2f09bc34ac14762d40591dd3d562