Merge "Handle PendingIntent-based callback for scan results" into oc-dev