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

* commit '942bd9dcfa33992f3b1c3a89c54fdfeef45260b7':
  Improve SurfaceView postion snapping

Change-Id: Ifbd2a6dd4c70aa8a64bac8cd5142d79c8928d6f8