Merge "Modify start/stop condition for mScreenDozeTimer."