Merge "Guard against updateDoze after detach"