Merge "Make one-time permission sessions continue over service restarts" into rvc-dev