TF: Finalize unpack_inputs-related changes
#16499
Merged
unpack_inputs-related changes
#16499