Merge "Add display configuration files."