Merge "Fixes animation video from not playing after onStop"