Merge "Configure notif permission migration behavior" into tm-dev