Merge "Nuplayer: Ensure AudioSink is closed before clearing Renderer"