Merge "Fix long characteristic write concurrency bug."