Merge "msm: sde: extend inline rotation timeout"