Merge "[SurfaceFlinger] Dump the composition type of each layer."