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