[#12779] Fix notifications update logic

[marquestye]

Part of #12779

Outline of Solution

• Evict the original entity before updating entity fields through setters
• Merge entity back into persistence context after verifying entity fields are all valid