Fix last item not visible bug
Merge branch 'r4.11.1'