am 75d958c4: Merge "Disable launching assist during setup" into mnc-dev

* commit '75d958c40e67c338d65df185ce1f09b164c58d49':
  Disable launching assist during setup