Merge "leanback: Fix playback screen alignment" into nyc-support-25.4-dev