They've said you will be able to disable lock on on the controller in 2.1.