Merge "Avoid showing/hiding task surfaces in window decor relayout" into main