am ac006439: Merge "Revert "Revert "Change SurfaceControl setPosition to take...
am ac006439: Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
* commit 'ac006439':
Revert "Revert "Change SurfaceControl setPosition to take floats""