Merge "Fix black frame in finishing transition" into nyc-dev