Merge "Fix missing first frame" into nyc-dev