Merge "Fixed some issues with alert window notifications"