Merge "Check whether the correct callingUid has the necessary permissions" into main