Merge "IPC StrictMode"