Merge "VoNR toggle" into sc-qpr1-dev