Merge "display: Remove VPU related code"