SF: Make screenshot surface async am: 605d15afbb
am: 6d4164bc9a

Change-Id: I88547ffedb80ee500ff508e1e788852c8806f52d