Merge "Fix issue cauing the taskbar to show in the all set page of the SUW." into tm-dev