Merge "Revert "Unbind CS if connection is not created within 15 seconds."" into main