Merge "Increase timeout to expect CapabilitiesChanged callback" into main