Merge "Disable activity leak detection by default for userdebug" into oc-dev