In https://github.com/flutter/flutter/pull/136300 I increased the timeout. This is a revert of that, which also adds an additional shard.