Merge "Add a setting to enable or disable corner invocation of assistant app" into sc-dev