Merge "Fix layering issue when launching from side TaskView" into main