case-3437 - Playlist floating fix
Merge branch 'case-3437' into develop
Merge remote-tracking branch 'origin/develop'