Merge "Fix NPE in BssidBlocklistMonitor" into rvc-dev