Merge "target: msm8952,8909 Check for ENABLE_DISPLAY flag"