Merge "Underline predictive text after updating the model." into devel/master