Merge "rename display-option attributes"