Merge "Clean up activity a bit and disable it by default" into oc-dev