Merge "Don't release WakeLock w/o active client" into rvc-qpr-dev