Merge "Better recording wake lock accounting" into klp-dev