Merge "Disable StrictMode when starting activity." into nyc-dev