Merge "Enable DisplayList properties"