Merge "Revert "Only allow 1 Stack on Leanback-only devices"" into lmp-preview-dev