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

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

Change-Id: Ib370a90726f56d58ef945107d1942bc5552dad8e