Merge "Merge "SF: Set state modified flag when changing sizes" into nyc-dev...
Merge "Merge "SF: Set state modified flag when changing sizes" into nyc-dev am: 0abac03f am: 3666cc2b" into nyc-mr1-dev-plus-aosp
am: 680f8a0c
* commit '680f8a0c':
Change-Id: Ieee82e762c94c397d95dc08c34784a7ef34f45d0