Merge "Prevent recursive calls when inserting a "wakelock-update" battery history event"