Merge "Use stopTimeoutMillis to avoid unnecessary bind/unbind" into main