Merge "msm: mdss: add timeout when waiting for vsync"