Merge "Remove non-test ScopedWakelock dependency" into rvc-dev