Revert "Wrong notification tone played for secondary user sometimes"

This reverts commit 3144b8d1ac99f8e1c7a0f0904fa68b97367ff8b7.