Merge "Add flag for user wakeup persistence" into main