Merge "Account for parent scroll position" into nyc-dev am: 38735b0
am: 1515fb7

* commit '1515fb7a10b9def116b1471b906d7bc807ecec7b':
  Account for parent scroll position