Merge "Check permissions when registering a scan pending intent" into oc-mr1-dev