Merge "Move display tests to DisplayServiceTests module" into udc-qpr-dev