Merge "Fix PartialWakeLock regression" into rvc-dev