Merge "Fix issue #5192141: systemui asplodes after enough tapping on the windowlist button"