Merge "Fix issue 4604090: notification sound interrupted."