Merge "Use new HWC display type/count constants." into klp-dev