Issue #2333911 - Restore the pre-views order of tasks in the queue blocks/lists.

Note that this fixes the problem on the initial install only. We need separate update to fix this also on upgrades.