Merge "Make Auto-scrolling base purely on edge offset, no longer on time." into nyc-andromeda-dev