Merge "Maybe fix issue #16167054: Wakelock is acquired and released in..." into lmp-dev