Merge "Fixed a bug with the anti-falsing logic with dismissing" into lmp-dev