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

* commit 'f52b9c8a4aebf6d04b747e45c921fa4f51344b34':
  Revert "Only allow 1 Stack on Leanback-only devices"