Merge "SurfaceFlinger: Avoid race in flag manager" into tm-dev