Better implementation of preceding commit
Better implementation of preceding commit

mpv-android/mpv-android,mpv-android/mpv-android,mpv-android/mpv-android,mpv-android/mpv-android,mpv-android/mpv-android