Merge "Ensure we change SurfaceView size from UI thread." into nyc-dev am: ffe3098
am: d4c85e1

* commit 'd4c85e182add4c0972f1d79163acd7281efa9f49':
  Ensure we change SurfaceView size from UI thread.

Change-Id: I6385721821ee4fa7984be316c409c52fe94b80cc