Merge "Fix NPE when querying EF Uri with non-existent subscription" into sc-qpr1-dev