Merge fixes: Single player mode - registering controller