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

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

Change-Id: I8e57aa126a601df935b6005b74ba7842f819c741