Merge "Limit too large scale_change exponent used in adjustTimeSlot"