Merge "Sanitize display list properties" into jb-dev