Merge "Refactor deleteWakeupFromUserStarts in UserWakeupStore" into main