Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev