Merge "msm_fb: hdmi: Proper switching of switch device" into msm-3.4