Merge "Increase toolkit touch boost timeout period" into main