Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev