Merge "Disable DisplayList properties"