Merge "Stop deferring wake lock logging." into sc-dev