Merge "Reject services that are both critical and oneshot"