Merge "Disable launching assist during setup" into mnc-dev