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

* commit '38735b00267b55219a77317ec3ce5ca60c5edd06':
  Account for parent scroll position