Merge "Add setting for assistant" into mnc-dev