Don't load the activity class immediately
Merge pull request #558 from ainsej/lazy-load-class

Don't load the activity class immediately