On multiline launchers are often as wide as tasks
Since on multiline launchers are often as big as tasks, don't remove launchers count from the task count when we're on multiline It's only a partial solution and tasks won't always be optimally wide, but is a simple one that can be cherrypicked to 6.0
In the long term the custom layouting code should be removed and be ported to a standard GridLayout
(cherry picked from commit 0c576c94)
0c576c94 On multiline launchers are often as wide as tasks