Merge "Temporary workaround for getDisplayStats" into udc-dev