Added keyboard suggestion customization
Merge