Merge "msm: timer: use less strict time jump workaround" into msm-3.0