Merge "Align the time of bssid comparison to avoid NPE caused by value changes." into main