Merge "Move stale handler cleanup to constructor" into lmp-dev