Merge "Acquire the wake lock to ensure RoR isn't delayed" into sc-dev