Merge "Move early-wake to transition start"