Merge "More list menu fixes" into lmp-dev