Merge "Fix heap trimmer daemon sleeping." into lmp-dev