Merge "Disable "touch to correct words" when suggestion strip is off"