Merge "WifiConfiguration: Modify time display in toString" into pi-dev