Merge "Do not move focus to top if dim surface is boosted on Task" into main