Merge "Add configurable default setting for assistant componentname" into pi-dev