Merge commit '8f36a744bc8933396f237fbda8f21c31ed41d504' into kraken * commit '8f36a744bc8933396f237fbda8f21c31ed41d504': Fix bug 2605504 Don't leak a metric ton of NotificationPlayer threads
Merge commit '8f36a744bc8933396f237fbda8f21c31ed41d504' into kraken * commit '8f36a744bc8933396f237fbda8f21c31ed41d504': Fix bug 2605504 Don't leak a metric ton of NotificationPlayer threads