Merge "Notification player: do not use stream types"