am 0296deef: Merge "More list menu fixes" into lmp-dev

* commit '0296deeffffcdf0c1418138bad40b4ac772e0ff0':
  More list menu fixes