Merge "Fix index computation for quick viewing." into nyc-dev