Converted CustomActivity test into integration test and fixed it
Merge branch 'CORE-1104-fix' of github.com:frontlinesms/frontlinesms2 into CORE-1104-fix