Merge "Make connected Wi-Fi message multiline to avoid cutoff." into oc-dev