Merge "Fix KeyboardView's verticalCorrection handling"