Merge "NotificationPlayer: fix focus not abandoned on playback error"