Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev