Merge "target: msm8996: Check for ENABLE_DISPLAY flag"