Merge "Fix slow migration of virtual playlists" into mainline-prod