Merge "Fix some taskbar stashing issues" into sc-v2-dev