Keyboard_and_Alignment_Fix
Merge