Merge "Add null check for notification preference helper" into tm-dev