Merge "Fixed NintendoSwitchProTest#testAllKeys CTS test failure." into sc-dev