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

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