Merge "Work on issue #17477510: Time change notifications sent too often" into lmp-dev