Merge "Do not allow stopping allowlisted packages" into tm-dev