Merge "Improve wakelock debugging:"