am f400051c: am 9e432a69: am d7e93570: am f11f9f47: Added a check if a custom activity can be started automerge: 57641a8 automerge: 0738bae

* commit 'f400051c3a6476154adf185399cb2ad8b2b16657':