Merge "Make getFrameNumber lazy" into nyc-dev