Merge "DO NOT MERGE: Add configurable default setting for assistant componentname" into pi-dev