Merge "NuPlayerRenderer: allow video to continue when audio ends"