Merge "Revert "Move InputBindingController to UserData"" into main