Merge "Make sure Tiling knows when a task is focused" into main