Merge "Revert "HWUI: Turn on Skia tracing by default"" into tm-dev