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

* commit '680f8a0cc4caf2749626dd1c17f90bc19c3715bc':

Change-Id: Ieee82e762c94c397d95dc08c34784a7ef34f45d0