Merge "Disable hardware skia when debug is disabled"