Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev