Merge "Re-add isSuggestionEnabled check"