Merge "defconfig: msm8610: enable options for QView"