Merge "Move wakelock release to handleMessage" into klp-modular-dev