Merge "Adjust conditions to hold onto a task's dim" into main