Merge "Track rebuffering time in nuplayer"