Merge "Enable/disable auto-join for Suggestions"