Merge "Enable Assistant hub mode settings on tangor" into tm-qpr-dev