Merge "Reduce auto-cork delay to 50ms"