Merge "Fix total wakelock duration calculation" into main