Merge "Fix notification visibility reporting"