Merge "Fix Keyboard Theme update when device orientation changed"