Merge "Fixed a bug where the notifications could overlap when reset" into lmp-dev