Merge "Improve tracking of 'playing time' metrics"