Merge "Scroll adjustments can disengage/reengage Scroll To End" into idea14-1.4-dev