Merge "Add the option to disable lazy notifications (2/2)" into tm-qpr-dev