Merge "More list menu improvements" into lmp-mr1-ub-dev