Merge "leanback: fix alignment when appending to last item." into nyc-support-25.4-dev