am 196a7dae: Merge "Sanitize display list properties" into jb-dev

* commit '196a7dae6387b118f73c78b7ae16ebfa604ae249':
  Sanitize display list properties