Merge "msm: display: increase fence timeout"