QAART-412 Fixes from CR. Adding back the flash message notification check