Merge "SurfaceFlinger: Detect Rel Z loops" into tm-dev