Merge "Refactor canAccessScanResult" into pi-dev