Merge "NotificationPlayer: fix race conditions" into oc-mr1-dev