Merge "Reject services that are both critical and oneshot" into rvc-dev