Merge "Implement PgUp/PgDn support.  (cherry-pick DO NOT MERGE)" into nyc-dev