Merge "Cannot determine Doze state during transition" into sc-dev