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