Merge "Reorder code so we can use different displays on the preview render" into udc-qpr-dev