Merge "mdss: hdmi: correct timeout value"