Merge "HdmiConfig class holding constants that may need customization"