Merge "Revert "Fix heap trimmer daemon sleeping.""