Clean up activity a bit and disable it by default

Test: visual & demo mode
Change-Id: I3718e7f58d21a28ae937064882c4edff10534701
Fixes: 36020978
6 files changed