Fix incorrect sorting by rank in TV grid on template create/update screen
(cherry picked from commit ad2f01e189f1795c24f5ce5fcb29ceab3f4ebca6)
Add changelog entry that was not cherry picked across (my bad)