[kodi/f41] (2 commits) ...Update to 21.2