Add `popular` and `trending` for Movies, fix type of `trending` for Shows.
Merge branch 'movies-popular-trending' into api-v2