Merge "defconfig: msm9625: disable display by default"