Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev