Merge "Turn on uid sandboxing" into rvc-dev