Merge "Stop showing RESTRICTED toast for new restriction." into tm-dev