Merge "Fix list menu not closing when sub menu opened" into nyc-support-24.1-dev