Merge "Add a developer option to disable app child process restrictions"