Merge pull request #2199 from skidau/remove-controls-lock Cleaned up the controller locking mechanism
