Merge "Remove clear/restore callingUid" into rvc-dev