Merge "Redirect Wifi Panel to settings page" into main