Merge "Fix MainKeyboardView visibility must be aligned with main keyboard frame"