Merge "Fix task window losing scale when going back to home" into main