Merge "Ensure taskbar animation ends when running window animation does" into sc-dev