Revert "Wrong notification tone played for secondary user sometimes"

This reverts commit 7278241cc77af83ee27d1621b20b44231069fe38.