Merge "Solve playlist items deletion issue" into mainline-prod