Merge "Use OVERLAY_2D for scroll overshoot etc." into devel/master