Fixup for 7cf2b580, makes sure cairo
has all data committed to the surface, and handle random errors.

Change-Id: I39e5b5777968c4563a8ce3870bac3d4182090f3b