Merge "Fix issue #5283365: Rotating the device to portrait mode, hides the keyboard partly"