Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into rvc-qpr-dev