Merge "Increase max allowed min update jitter to 30s" into sc-dev