Merge "SurfaceFlinger: Dump on layer leaks" into tm-dev