Merge "Fix double release of ScopedWakelock" into rvc-qpr-dev