Merge "40424: Wakelock Release check not quite correct"