am 4e523094: am e4de3fbe: Merge "Fixed a bug where the notifications and the clock could jump" into lmp-dev

* commit '4e523094e9b440958c6eb29ea515b3187b4e195f':
  Fixed a bug where the notifications and the clock could jump