Fork qcom/display to fix werror