Merge "Fix heap trimmer daemon sleeping."