Reduce flickering while switching activities

Reverts 4f4f22eacd342d6a671e1fc685d2228dee98d4da

Refs #804