Merge "Update doze state when device wakes-up"