Merge "Set timeout for binding service to avoid thread blocking" into main