Merge "Improve SurfaceView postion snapping" into nyc-dev
am: 987609f

* commit '987609f5a7bd8e18559334aa0260e6614520af13':
  Improve SurfaceView postion snapping

Change-Id: I402bb1b85f8ae987723e6f2398b4245dfb76ba37