Merge "Fix return type hints in media related classes"