Merge "API fix: getProprietaryCallExtras should not return null" into rvc-dev