Merge "Reset scroll when all items removed." into lmp-mr1-dev