Revert: Wrong notification tone played for secondary user sometimes

This reverts commit: 59efb281f246d1dabe70b8a2d8d5cbffdee32c7e