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

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

Change-Id: Ifd3ee6abdc12d141a7de0f2a2f3800017da6a69e