Merge "[SurfaceFlinger] Fix HWComposer error message." into pi-dev