MOBILE-441 - Unsupported activities
Merge branch 'MOBILE-441' into release_candidate

Conflicts:
	config.json