Merge "Account for parent scroll position" into nyc-dev