Merge "Parcel only the canonical Uri.Part representation, not both." into qt-qpr1-dev