Merge "Fix minKeyboardHeight of tablet"