Merge "Persist the one-time permission flag if set" into rvc-dev