Merge \"SF: Make screenshot surface async\" into nyc-mr1-dev
am: 3dd1045c27

Change-Id: I42d125415cc52e09299305f70337168d65842135