Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev