Merge "Increase StartInputHistory entry size"