Merge "Fix playlist bug" into mainline-prod