Merge "display: Add support for multiple displays" into p-keystone-qcom