Fix by Andi Albrecht to improve the behavior of n/p after adding more context incrementally.
Fix by Andi Albrecht to improve the behavior of n/p after adding more
context incrementally.

nicko96/Chrome-Infra,nicko96/Chrome-Infra,nicko96/Chrome-Infra,nicko96/Chrome-Infra,riannucci/rietveldv2,riannucci/rietveldv2,nicko96/Chrome-Infra