Merge "Track app and display wakelocks separately."