Merge "Improve SurfaceView postion snapping" into nyc-dev