Merge "Change the default Controller keys for RoboTests"