#1583 - Context menu no longer closes on scroll + update in tests