Merge "Increase the bytes per config threshold to avoid too frequent uploading." into pi-dev