Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev