Merge "SF: Increase default tracing buffer size to 20MB"