Merge changes Id150f78d,Iec948124 into pi-dev

* changes:
  SurfaceFlinger: Regression test for b/74220420
  SurfaceFlinger: Fix GL composition of ColorLayers