Merge "Ensure surfaces only resize during relayout." into nyc-dev
am: 58f1167ecf

* commit '58f1167ecf03c4cdce7e881ccf7c0e0506c14613':
  Ensure surfaces only resize during relayout.

Change-Id: I197a1689594ac877e34747d2331620ca98a14af5