Merge "Add a debug property to enable Skia systrace"