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

Change-Id: Icab8fff0e4614316f8f24aaed1219e69207d8855