Merge "Fix invalid update to TextUpdateInfo in SELECTING state." into devel/master