Merge "Fix issue #3130426: Finsky crash in switching from window carousel"