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