Merge "SurfaceFlinger: Modify the meaning of composition strategy changes"