Merge "Add bottom padding protection to pref list on TV" into nyc-dev