Merge "target: msm8996: Add support for display suspend/resume"