Merge "Finer synchronization for nuplayer stats"