Merge "Check Wi-Fi network identification when monitoring connection state" into main