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

Change-Id: Idb7475a6715e8cc5d4f2c9e2e418d4cedd7d9c10