Merge "Extend the widget service connection timeout to 20 seconds" into main