Electric shock dog collars banned under new government proposal