Merge "Fix scrolling bug causing centered cursor."