Merge "Refactored ControlRenderer so that derived classes are responsible for the...