Backport 3.3.x

Closed Nicolas Pomepuy requested to merge Aza/vlc-android:3.3.x into 3.3.x

Merge request reports