Merge "Fix issue #15195464: battery history says wakelock held when it's not" into lmp-preview-dev