Merge "Remove USE_DISPLAY_LIST_PROPERTIES flag"