am c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev
automerge: dd985c2

* commit 'dd985c21dd4f5957e8d6e052976623d127e8f090':
  Prevent activities from being started during setup wizard.