TRUNK-2984:Improve UI of showing notifications to the user