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