## Description
Ports two changes in the official jellyfin android TV app here:
- https://github.com/jellyfin/jellyfin-androidtv/pull/5240
- https://github.com/jellyfin/jellyfin-androidtv/pull/5186
The code changes are copied under GPL-2.0 from the above pull requests.
### Related issues
Closes#1260
### Testing
Emulator mostly
## Screenshots
N/A
## AI or LLM usage
None
---------
Co-authored-by: Niels van Velzen <git@ndat.nl>
Co-authored-by: clams4shoes <prestidgeandrew@gmail.com>
61afe6ba86