Merge "Stop Wake Lock thread if it is running"