Merge "Acquire wakelock on endpoint callbacks" into main