Merge "Improve SurfaceView postion snapping" into nyc-dev am: 987609f am: 942bd9d
am: 20e267a

* commit '20e267ab945702260cfe62738f2f88bff737163a':
  Improve SurfaceView postion snapping

Change-Id: Id87a57c0f9d7381f6ae59397f25a4c11afb9bb39