House clears two gun safety bills, but Senate may be roadblock