Merge "Rename Wi-Fi switch controller's key" into sc-dev