Merge "Added a check if a custom activity can be started" into lmp-mr1-dev