Merge "SF: Make screenshot surface async" into nyc-mr1-dev