Merge "Prevent system uid component from running in an isolated app process" into oc-dev