Merge "Add notion of Quirks the Device Display Config files."