Merge "surfaceflinger: fix race condition" into pi-dev