Merge "Allow users to block notification channels" into tm-dev