Merge "msm: timer: use appropriate workaround for timer instability" into msm-3.0