Merge "Update the policy transparency tests with the new dialog changes" into sc-dev