Merge "Reset support for notification toggle." into tm-qpr-dev