Merge "Fix a transparent flicker due to wrong crop" into nyc-dev