Merge "Fix typo preventing layers from scrolling to top"