Merge "target: msm8996: enable JDI 4K non-FBC as default for liquid"