Merge "defconfig: msm9625: enable display support"