Merge "Fix DisplayState sanitization." into udc-qpr-dev