Merge "nuplayer: let non-offload AudioSink to handle the reconnect when there's video." into mnc-dr-dev