Merge "Ensure wakelock is released unconditionally." into lmp-dev