Merge "Fix small bug with TaskView tile expansion" into main