Thailand shelves plan for new security law to counter southern unrest