Merge "Clean up activity a bit and disable it by default" into oc-dev am: 1df5ca5911
am: eae4ab352e

Change-Id: I161a6acef191800f1f491864061a06c8794af9cb