Fix last item not visible bug
Merge branch 'r4.11.1'
Merge branch 'master' into embed-customization
Tweak embed customization