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

Change-Id: I271e6ae1f21d3fb913019a638c87b3d2f5a207d2