Merge "Correct the keyboard shortcut for SMS"