Fix 'First tap on notification can dismiss it'