Merge "Do not hold wm lock when loading recent task files" into main