Merge "Call getAllowedUid on a separate thread" into oc-dev