Merge "Revert "defconfig: 9615: enable display support"" into msm-3.0