Merge "Remove internal display related methods"