Merge "Fix issue #30929080: Default Assist app is set to None..." into nyc-mr1-dev