Merge "Retain Emoji Keyboard after rotation"