Merge "Move UserWakeupStore initialization to happen before it is used" into main