Merge "Remove "State<T> as a parameter" of Text.kt" into main