As a replacement to the "playlist mode" we tested on Jive I propose the following behavior to reduce the chance that the user will accidentally destroy a playlist under construction.  In this context being "edited" means that the user has made a modification to the current playlist (by deleting or adding items to it).  Simply playing a song, album, station, etc. doesn't trigger "editing".

1.  If the playlist is empty or has not been "edited", then touch on a song will play that song (and the other songs in its context, i.e. the album or other songs in the displayed playlist).

2.  If the user uses the context menu to edit the playlist, by touch-hold and adding or deleting a song from the CM, then the current playlist is being "edited".

3.  Subsequent simple touches to a song will then bring up the CM until the playlist has been cleared or replaced.