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

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

Change-Id: Id7820d7ef5f8dfed7f67bc9ad524de3205c1f3f1