- when syncing the number of times played for all songs, be sure to do a merge of local and remote dates played

Change-Id: I2b41c00c94a6be32f838d2eb8a23c9f9ec90fb73