Merge "Clean up DozeService plugin listeners."