Merge "Revert "msm: sde: reduce kickoff timeout to 2 vsyncs"" into msm-4.9