Merge "Boost the surface layer of the dimmed TaskFragment" into main